Fix a merge conflict
authorMatthias Clasen <mclasen@redhat.com>
Thu, 3 Sep 2009 01:39:36 +0000 (21:39 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 3 Sep 2009 01:39:36 +0000 (21:39 -0400)
commit36a73586cea7783c06aa6eab08751b1abf58c8c1
tree3f1bad2b2bcd7a3a255d9805af75db29530a4a16
parent4e6e46d621f128c3756b476a8d4b3a540c0df285
Fix a merge conflict
po/hu.po